Skip to content

chore(fork): merge upstream/main into collin/main (2026-11-19) - #63

Merged
collissimo merged 166 commits into
collin/mainfrom
fork-sync/2026-11-19
Nov 19, 2026
Merged

collissimo merged 166 commits into
collin/mainfrom
fork-sync/2026-11-19

Conversation

@collissimo

Copy link
Copy Markdown
Owner

Upstream sync with two conflicts:

  • RunExecutionService.ts: upstream moved MCP app context reading into McpAppModelContext.forProvider; kept that plus the fork's orchestrator threadInstructions.
  • apps/web/test/fakeEnvironment.ts: kept the fork's shellSubscribers set; upstream's side-chat fork now offers to all shell subscribers.

Also: upstream's new no-untranslated-copy lint flagged the fork's orchestrator palette titles; wrapped in gt() and translated in every web locale.

Verified: server+web typecheck, RunExecutionService tests, ChatView side-chat browser tests, lint/knip/i18n:check.

🤖 Generated with Claude Code

t3dotgg and others added 30 commits November 17, 2026 22:13
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… renders (pingdotgg#38458)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…poser (pingdotgg#38443)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#38451)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
pingdotgg#38476)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…pingdotgg#29861)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…rkup (pingdotgg#33403)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…sts no longer crashes the server (pingdotgg#30946)

Co-authored-by: Isaac-b-ux <264455269+Isaac-b-ux@users.noreply.github.com>
Co-authored-by: Claude Sonnet 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…tgg#38517)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… MCP credentials (pingdotgg#26652)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
…ject file (pingdotgg#38510)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…s in generated folder and branch names (pingdotgg#38540)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…h screens (pingdotgg#38546)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
navidnadali and others added 29 commits November 18, 2026 20:54
pingdotgg#38856)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ad (pingdotgg#38890)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…otgg#38892)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…round work details (pingdotgg#38904)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ngdotgg#38848)

Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
… the PR merges (pingdotgg#38926)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…gg#28029)

Co-authored-by: Claude Fable 5.2 (primary) <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
…otgg#34444)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ount (pingdotgg#34194)

Co-authored-by: Nicholas Wasmiller <derped@mnpl.fyi>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…tgg#23668)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…d of the portable archive (pingdotgg#35268)

Co-authored-by: Felix Mrak <180021770+felixleopold@users.noreply.github.com>
Co-authored-by: Claude Sonnet 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Conflicts: RunExecutionService uses upstream's McpAppModelContext.forProvider
and keeps the fork's orchestrator threadInstructions; fakeEnvironment keeps the
fork's multi-subscriber shell set and routes upstream's side-chat fork through it.
The fork's orchestrator palette titles now go through gt() to satisfy upstream's
new no-untranslated-copy lint, with translations in every web locale.

Verified: server+web typecheck, RunExecutionService.test.ts (83 pass), ChatView side-chat browser tests (3 pass), lint+knip+i18n:check via pre-commit
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@collissimo
collissimo merged commit 088f6a1 into collin/main Nov 19, 2026
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.